Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature - Qt 6 port #1 #606

Merged
merged 31 commits into from
Oct 25, 2024
Merged

Feature - Qt 6 port #1 #606

merged 31 commits into from
Oct 25, 2024

Conversation

cedrik-fuoco-adsk
Copy link
Contributor

@cedrik-fuoco-adsk cedrik-fuoco-adsk commented Oct 18, 2024 •
edited
Loading

Feature - Qt 6 port # 1

Linked issues

#367

Summarize your change.

This is the first phase of the Qt 6 port. It was mostly tested on Rocky Linux 8.

There are a lot of generated files under src/lib/mu/MuQt6, and some modifications but you don't need to go over that folder.

There are known issues that will be addressed in future PR:

All platforms:

  • Refactor QtAudioRenderer class. Currently, The pulse audio output device is not enabled, and they are loud white noise issues on MacOS.
  • Remove the usage of Core5compat and refactor what is deprecated. I don't think there is a lot to do here, but it is mostly about refactor the usage of QTextCodec.

MacOS:

  • The Open File dialog does not open anymore.
  • Loud white noise audio (Should be related to QtAudioRenderer)
  • The Central widget is rendered in the bottom left corner, but as soon as you resize the windows, it goes back to normal.

Windows:

  • Issue with the compilation of Shiboken6

Describe what you have tested and on which operating system.

  • Rocky LInux 8
  • MacOS

Add a list of changes, and note any that might need special attention during the review.

@cedrik-fuoco-adsk cedrik-fuoco-adsk changed the base branch from main to feature/qt6 October 18, 2024 19:03
@cedrik-fuoco-adsk cedrik-fuoco-adsk force-pushed the qt6 branch 2 times, most recently from d145cee to ce88c23 Compare October 21, 2024 17:34
@cedrik-fuoco-adsk
rvprof
6b16b28 
Signed-off-by: Cédrik Fuoco <[email protected]>
@cedrik-fuoco-adsk
Changing QGLWidget to QOpenGLWidget
619030b 
Signed-off-by: Cédrik Fuoco <[email protected]>
@cedrik-fuoco-adsk
RvSession initialization changed and showing widget earlier
91fb787 
Signed-off-by: Cédrik Fuoco <[email protected]>
@cedrik-fuoco-adsk
GLFBO fix, can now render into the default framebuffer
e2d9ccf 
Signed-off-by: Cédrik Fuoco <[email protected]>
@cedrik-fuoco-adsk
Fix compilations issues on Windows and call glewInit when we are sure…
7b8ca36 
… that the context is initialized

Signed-off-by: Cédrik Fuoco <[email protected]>
@cedrik-fuoco-adsk
Fix issue on MacOS, set OpenGL version to 2.1 for now, and clean up
a549189 
Signed-off-by: Cédrik Fuoco <[email protected]>
@cedrik-fuoco-adsk
Refactoring usage of QApplication::desktop() and QDesktopWidget
4a1e15c 
Signed-off-by: Cédrik Fuoco <[email protected]>
@cedrik-fuoco-adsk
QRegExp to QRegularExpression
f689757 
Signed-off-by: Cédrik Fuoco <[email protected]>
@cedrik-fuoco-adsk
Allow qt5 and qt6 at the same time
7564ead 
Signed-off-by: Cédrik Fuoco <[email protected]>
@cedrik-fuoco-adsk
QElapsedTimer refactor
43314ca 
Signed-off-by: Cédrik Fuoco <[email protected]>
@cedrik-fuoco-adsk
Refactor delta function usage
5477b0a 
Signed-off-by: Cédrik Fuoco <[email protected]>
@cedrik-fuoco-adsk
Refactor some QString enum that moved. Same in 5.15 and 6
cc618d6 
Signed-off-by: Cédrik Fuoco <[email protected]>
@cedrik-fuoco-adsk
Refactor QTAudioRenderer with supports for less sample size and type.…
89fddad 
… Will try to re-implement those later. THIS IS NOT TESTED YET.

Signed-off-by: Cédrik Fuoco <[email protected]>
@cedrik-fuoco-adsk
Allow qt5 and qt6 at the same time AcademySoftwareFoundation#2
5095bc9 
Signed-off-by: Cédrik Fuoco <[email protected]>
@cedrik-fuoco-adsk
Copy MuQt5 into MuQt6 and delete generated files.
dca066b 
Signed-off-by: Cédrik Fuoco <[email protected]>
@cedrik-fuoco-adsk
Changes to support MuQt5 and MuQt6 at the same time. Not generated yet.
96e1873 
Signed-off-by: Cédrik Fuoco <[email protected]>
@cedrik-fuoco-adsk
First pass of MuQt6 generations, not compiled yet
a79eb0d 
Signed-off-by: Cédrik Fuoco <[email protected]>
@cedrik-fuoco-adsk
Second pass Mu bindings
bc28471 
Signed-off-by: Cédrik Fuoco <[email protected]>
@cedrik-fuoco-adsk
Mu binding generation and various fix
1a061f4 
Signed-off-by: Cédrik Fuoco <[email protected]>
@cedrik-fuoco-adsk
handrolling QProcess::startDetatch
9aa6882 
Signed-off-by: Cédrik Fuoco <[email protected]>
@cedrik-fuoco-adsk
Refactor PySide naming, fixing pyside6 compilation and adding missing…
cd147ca 
… mu binding

Signed-off-by: Cédrik Fuoco <[email protected]>
@cedrik-fuoco-adsk
Allow the usage for Qt5 and Qt6 at the same time in a few Mu script, …
b06a990 
…NOT RECOMMENDED TO DO IN A NEW SCRIPT

Signed-off-by: Cédrik Fuoco <[email protected]>
@cedrik-fuoco-adsk
Allow pyside2 and pyside6 in python scripts
2453159 
Signed-off-by: Cédrik Fuoco <[email protected]>
bernie-laberge
bernie-laberge reviewed Oct 23, 2024
View reviewed changes
.gitignore Outdated Show resolved Hide resolved
bernie-laberge
bernie-laberge approved these changes Oct 23, 2024
View reviewed changes
Copy link
Contributor

@bernie-laberge bernie-laberge left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.
This is a phenomenal progress, bringing us much closer to completing the Qt 6 port!
Thank you Cédrik !

eloisebrosseau
eloisebrosseau approved these changes Oct 24, 2024
View reviewed changes
src/build/make_pyside6.py Outdated Show resolved Hide resolved
src/bin/python/py-interp/tests/test_PySide2.py Outdated Show resolved Hide resolved
src/build/make_pyside6.py Outdated Show resolved Hide resolved
src/lib/app/RvCommon/QTGLVideoDevice.cpp Outdated Show resolved Hide resolved
src/lib/app/RvCommon/RvApplication.cpp Outdated Show resolved Hide resolved
@cedrik-fuoco-adsk cedrik-fuoco-adsk force-pushed the qt6 branch 2 times, most recently from ff72cbd to 35ee947 Compare October 24, 2024 16:27
@cedrik-fuoco-adsk cedrik-fuoco-adsk merged commit 5ca3dd8 into AcademySoftwareFoundation:feature/qt6 Oct 25, 2024
12 checks passed
cedrik-fuoco-adsk added a commit to cedrik-fuoco-adsk/OpenRV that referenced this pull request Nov 7, 2024
@cedrik-fuoco-adsk
Feature - Qt 6 port AcademySoftwareFoundation#1 (AcademySoftwareFound…
57b89d1 
…ation#606)

### Feature - Qt 6 port # 1

### Linked issues
AcademySoftwareFoundation#367 

### Summarize your change.
This is the first phase of the Qt 6 port. It was mostly tested on Rocky
Linux 8.

There are a lot of generated files under `src/lib/mu/MuQt6`, and some
modifications but you don't need to go over that folder.

There are known issues that will be addressed in future PR:

**All platforms:**
- Refactor _QtAudioRenderer_ class. Currently, The _pulse_ audio output
device is not enabled, and they are loud white noise issues on MacOS.
- Remove the usage of _Core5compat_ and refactor what is deprecated. I
don't think there is a lot to do here, but it is mostly about refactor
the usage of _QTextCodec_.

**MacOS:**
- The _Open File dialog_ does not open anymore.
- Loud white noise audio (Should be related to _QtAudioRenderer_)
- The Central widget is rendered in the bottom left corner, but as soon
as you resize the windows, it goes back to normal.

**Windows:**
- Issue with the compilation of Shiboken6

### Describe what you have tested and on which operating system.

- [ ] Rocky LInux 8
- [ ] MacOS

### Add a list of changes, and note any that might need special
attention during the review.

---------

Signed-off-by: Cédrik Fuoco <[email protected]>
cedrik-fuoco-adsk added a commit to cedrik-fuoco-adsk/OpenRV that referenced this pull request Nov 7, 2024
@cedrik-fuoco-adsk
Feature - Qt 6 port AcademySoftwareFoundation#1 (AcademySoftwareFound…
dd94e52 
…ation#606)

### Feature - Qt 6 port # 1

### Linked issues
AcademySoftwareFoundation#367 

### Summarize your change.
This is the first phase of the Qt 6 port. It was mostly tested on Rocky
Linux 8.

There are a lot of generated files under `src/lib/mu/MuQt6`, and some
modifications but you don't need to go over that folder.

There are known issues that will be addressed in future PR:

**All platforms:**
- Refactor _QtAudioRenderer_ class. Currently, The _pulse_ audio output
device is not enabled, and they are loud white noise issues on MacOS.
- Remove the usage of _Core5compat_ and refactor what is deprecated. I
don't think there is a lot to do here, but it is mostly about refactor
the usage of _QTextCodec_.

**MacOS:**
- The _Open File dialog_ does not open anymore.
- Loud white noise audio (Should be related to _QtAudioRenderer_)
- The Central widget is rendered in the bottom left corner, but as soon
as you resize the windows, it goes back to normal.

**Windows:**
- Issue with the compilation of Shiboken6

### Describe what you have tested and on which operating system.

- [ ] Rocky LInux 8
- [ ] MacOS

### Add a list of changes, and note any that might need special
attention during the review.

---------

Signed-off-by: Cédrik Fuoco <[email protected]>
cedrik-fuoco-adsk added a commit to cedrik-fuoco-adsk/OpenRV that referenced this pull request Nov 7, 2024
@cedrik-fuoco-adsk
Feature - Qt 6 port AcademySoftwareFoundation#1 (AcademySoftwareFound…
9761ed1 
…ation#606)

### Feature - Qt 6 port # 1

### Linked issues
AcademySoftwareFoundation#367

### Summarize your change.
This is the first phase of the Qt 6 port. It was mostly tested on Rocky
Linux 8.

There are a lot of generated files under `src/lib/mu/MuQt6`, and some
modifications but you don't need to go over that folder.

There are known issues that will be addressed in future PR:

**All platforms:**
- Refactor _QtAudioRenderer_ class. Currently, The _pulse_ audio output
device is not enabled, and they are loud white noise issues on MacOS.
- Remove the usage of _Core5compat_ and refactor what is deprecated. I
don't think there is a lot to do here, but it is mostly about refactor
the usage of _QTextCodec_.

**MacOS:**
- The _Open File dialog_ does not open anymore.
- Loud white noise audio (Should be related to _QtAudioRenderer_)
- The Central widget is rendered in the bottom left corner, but as soon
as you resize the windows, it goes back to normal.

**Windows:**
- Issue with the compilation of Shiboken6

### Describe what you have tested and on which operating system.

- [ ] Rocky LInux 8
- [ ] MacOS

### Add a list of changes, and note any that might need special
attention during the review.

---------

Signed-off-by: Cédrik Fuoco <[email protected]>
cedrik-fuoco-adsk added a commit to cedrik-fuoco-adsk/OpenRV that referenced this pull request Nov 8, 2024
@cedrik-fuoco-adsk
Feature - Qt 6 port AcademySoftwareFoundation#1 (AcademySoftwareFound…
b69531a 
…ation#606)

### Feature - Qt 6 port # 1

### Linked issues
AcademySoftwareFoundation#367 

### Summarize your change.
This is the first phase of the Qt 6 port. It was mostly tested on Rocky
Linux 8.

There are a lot of generated files under `src/lib/mu/MuQt6`, and some
modifications but you don't need to go over that folder.

There are known issues that will be addressed in future PR:

**All platforms:**
- Refactor _QtAudioRenderer_ class. Currently, The _pulse_ audio output
device is not enabled, and they are loud white noise issues on MacOS.
- Remove the usage of _Core5compat_ and refactor what is deprecated. I
don't think there is a lot to do here, but it is mostly about refactor
the usage of _QTextCodec_.

**MacOS:**
- The _Open File dialog_ does not open anymore.
- Loud white noise audio (Should be related to _QtAudioRenderer_)
- The Central widget is rendered in the bottom left corner, but as soon
as you resize the windows, it goes back to normal.

**Windows:**
- Issue with the compilation of Shiboken6

### Describe what you have tested and on which operating system.

- [ ] Rocky LInux 8
- [ ] MacOS

### Add a list of changes, and note any that might need special
attention during the review.

---------

Signed-off-by: Cédrik Fuoco <[email protected]>
cedrik-fuoco-adsk added a commit to cedrik-fuoco-adsk/OpenRV that referenced this pull request Nov 8, 2024
@cedrik-fuoco-adsk
Feature - Qt 6 port AcademySoftwareFoundation#1 (AcademySoftwareFound…
1f03a94 
…ation#606)

### Feature - Qt 6 port # 1

### Linked issues
AcademySoftwareFoundation#367

### Summarize your change.
This is the first phase of the Qt 6 port. It was mostly tested on Rocky
Linux 8.

There are a lot of generated files under `src/lib/mu/MuQt6`, and some
modifications but you don't need to go over that folder.

There are known issues that will be addressed in future PR:

**All platforms:**
- Refactor _QtAudioRenderer_ class. Currently, The _pulse_ audio output
device is not enabled, and they are loud white noise issues on MacOS.
- Remove the usage of _Core5compat_ and refactor what is deprecated. I
don't think there is a lot to do here, but it is mostly about refactor
the usage of _QTextCodec_.

**MacOS:**
- The _Open File dialog_ does not open anymore.
- Loud white noise audio (Should be related to _QtAudioRenderer_)
- The Central widget is rendered in the bottom left corner, but as soon
as you resize the windows, it goes back to normal.

**Windows:**
- Issue with the compilation of Shiboken6

### Describe what you have tested and on which operating system.

- [ ] Rocky LInux 8
- [ ] MacOS

### Add a list of changes, and note any that might need special
attention during the review.

---------

Signed-off-by: Cédrik Fuoco <[email protected]>
cedrik-fuoco-adsk added a commit to cedrik-fuoco-adsk/OpenRV that referenced this pull request Nov 28, 2024
@cedrik-fuoco-adsk
Feature - Qt 6 port AcademySoftwareFoundation#1 (AcademySoftwareFound…
09b7ef5 
…ation#606)

This is the first phase of the Qt 6 port. It was mostly tested on Rocky
Linux 8.

There are a lot of generated files under `src/lib/mu/MuQt6`, and some
modifications but you don't need to go over that folder.

There are known issues that will be addressed in future PR:

**All platforms:**
- Refactor _QtAudioRenderer_ class. Currently, The _pulse_ audio output
device is not enabled, and they are loud white noise issues on MacOS.
- Remove the usage of _Core5compat_ and refactor what is deprecated. I
don't think there is a lot to do here, but it is mostly about refactor
the usage of _QTextCodec_.

**MacOS:**
- The _Open File dialog_ does not open anymore.
- Loud white noise audio (Should be related to _QtAudioRenderer_)
- The Central widget is rendered in the bottom left corner, but as soon
as you resize the windows, it goes back to normal.

**Windows:**
- Issue with the compilation of Shiboken6

- [ ] Rocky LInux 8
- [ ] MacOS

attention during the review.

---------

Signed-off-by: Cédrik Fuoco <[email protected]>
cedrik-fuoco-adsk added a commit to cedrik-fuoco-adsk/OpenRV that referenced this pull request Nov 28, 2024
@cedrik-fuoco-adsk
Feature - Qt 6 port AcademySoftwareFoundation#1 (AcademySoftwareFound…
0019cee 
…ation#606)

This is the first phase of the Qt 6 port. It was mostly tested on Rocky
Linux 8.

There are a lot of generated files under `src/lib/mu/MuQt6`, and some
modifications but you don't need to go over that folder.

There are known issues that will be addressed in future PR:

**All platforms:**
- Refactor _QtAudioRenderer_ class. Currently, The _pulse_ audio output
device is not enabled, and they are loud white noise issues on MacOS.
- Remove the usage of _Core5compat_ and refactor what is deprecated. I
don't think there is a lot to do here, but it is mostly about refactor
the usage of _QTextCodec_.

**MacOS:**
- The _Open File dialog_ does not open anymore.
- Loud white noise audio (Should be related to _QtAudioRenderer_)
- The Central widget is rendered in the bottom left corner, but as soon
as you resize the windows, it goes back to normal.

**Windows:**
- Issue with the compilation of Shiboken6

- [ ] Rocky LInux 8
- [ ] MacOS

attention during the review.

---------

Signed-off-by: Cédrik Fuoco <[email protected]>
cedrik-fuoco-adsk added a commit to cedrik-fuoco-adsk/OpenRV that referenced this pull request Nov 28, 2024
@cedrik-fuoco-adsk
Feature - Qt 6 port AcademySoftwareFoundation#1 (AcademySoftwareFound…
30f3c4f 
…ation#606)

This is the first phase of the Qt 6 port. It was mostly tested on Rocky
Linux 8.

There are a lot of generated files under `src/lib/mu/MuQt6`, and some
modifications but you don't need to go over that folder.

There are known issues that will be addressed in future PR:

**All platforms:**
- Refactor _QtAudioRenderer_ class. Currently, The _pulse_ audio output
device is not enabled, and they are loud white noise issues on MacOS.
- Remove the usage of _Core5compat_ and refactor what is deprecated. I
don't think there is a lot to do here, but it is mostly about refactor
the usage of _QTextCodec_.

**MacOS:**
- The _Open File dialog_ does not open anymore.
- Loud white noise audio (Should be related to _QtAudioRenderer_)
- The Central widget is rendered in the bottom left corner, but as soon
as you resize the windows, it goes back to normal.

**Windows:**
- Issue with the compilation of Shiboken6

- [ ] Rocky LInux 8
- [ ] MacOS

attention during the review.

---------

Signed-off-by: Cédrik Fuoco <[email protected]>
cedrik-fuoco-adsk added a commit to cedrik-fuoco-adsk/OpenRV that referenced this pull request Nov 28, 2024
@cedrik-fuoco-adsk
Feature - Qt 6 port AcademySoftwareFoundation#1 (AcademySoftwareFound…
d8108ec 
…ation#606)

This is the first phase of the Qt 6 port. It was mostly tested on Rocky
Linux 8.

There are a lot of generated files under `src/lib/mu/MuQt6`, and some
modifications but you don't need to go over that folder.

There are known issues that will be addressed in future PR:

**All platforms:**
- Refactor _QtAudioRenderer_ class. Currently, The _pulse_ audio output
device is not enabled, and they are loud white noise issues on MacOS.
- Remove the usage of _Core5compat_ and refactor what is deprecated. I
don't think there is a lot to do here, but it is mostly about refactor
the usage of _QTextCodec_.

**MacOS:**
- The _Open File dialog_ does not open anymore.
- Loud white noise audio (Should be related to _QtAudioRenderer_)
- The Central widget is rendered in the bottom left corner, but as soon
as you resize the windows, it goes back to normal.

**Windows:**
- Issue with the compilation of Shiboken6

- [ ] Rocky LInux 8
- [ ] MacOS

attention during the review.

---------

Signed-off-by: Cédrik Fuoco <[email protected]>
cedrik-fuoco-adsk added a commit to cedrik-fuoco-adsk/OpenRV that referenced this pull request Nov 28, 2024
@cedrik-fuoco-adsk
Feature - Qt 6 port AcademySoftwareFoundation#1 (AcademySoftwareFound…
54bc5c6 
…ation#606)

This is the first phase of the Qt 6 port. It was mostly tested on Rocky
Linux 8.

There are a lot of generated files under `src/lib/mu/MuQt6`, and some
modifications but you don't need to go over that folder.

There are known issues that will be addressed in future PR:

**All platforms:**
- Refactor _QtAudioRenderer_ class. Currently, The _pulse_ audio output
device is not enabled, and they are loud white noise issues on MacOS.
- Remove the usage of _Core5compat_ and refactor what is deprecated. I
don't think there is a lot to do here, but it is mostly about refactor
the usage of _QTextCodec_.

**MacOS:**
- The _Open File dialog_ does not open anymore.
- Loud white noise audio (Should be related to _QtAudioRenderer_)
- The Central widget is rendered in the bottom left corner, but as soon
as you resize the windows, it goes back to normal.

**Windows:**
- Issue with the compilation of Shiboken6

- [ ] Rocky LInux 8
- [ ] MacOS

attention during the review.

---------

Signed-off-by: Cédrik Fuoco <[email protected]>
cedrik-fuoco-adsk added a commit to cedrik-fuoco-adsk/OpenRV that referenced this pull request Nov 28, 2024
@cedrik-fuoco-adsk
Feature - Qt 6 port AcademySoftwareFoundation#1 (AcademySoftwareFound…
fc283fa 
…ation#606)

This is the first phase of the Qt 6 port. It was mostly tested on Rocky
Linux 8.

There are a lot of generated files under `src/lib/mu/MuQt6`, and some
modifications but you don't need to go over that folder.

There are known issues that will be addressed in future PR:

**All platforms:**
- Refactor _QtAudioRenderer_ class. Currently, The _pulse_ audio output
device is not enabled, and they are loud white noise issues on MacOS.
- Remove the usage of _Core5compat_ and refactor what is deprecated. I
don't think there is a lot to do here, but it is mostly about refactor
the usage of _QTextCodec_.

**MacOS:**
- The _Open File dialog_ does not open anymore.
- Loud white noise audio (Should be related to _QtAudioRenderer_)
- The Central widget is rendered in the bottom left corner, but as soon
as you resize the windows, it goes back to normal.

**Windows:**
- Issue with the compilation of Shiboken6

- [ ] Rocky LInux 8
- [ ] MacOS

attention during the review.

---------

Signed-off-by: Cédrik Fuoco <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@KevinJW KevinJW KevinJW left review comments

@bernie-laberge bernie-laberge bernie-laberge approved these changes

@eloisebrosseau eloisebrosseau eloisebrosseau approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@cedrik-fuoco-adsk @KevinJW @eloisebrosseau @bernie-laberge